From f8512e1c61a840d10b2a8f74550b53d5bddbb1f3 Mon Sep 17 00:00:00 2001 From: Steven Hand Date: Fri, 29 Dec 2006 18:17:56 +0000 Subject: [PATCH] (temporarily) revert cset 13174:766eec31afab since it seems to break 64-bit; a proper fix will arrive in the new year. Signed-off-by: Steven Hand --- tools/python/xen/xm/XenAPI.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/tools/python/xen/xm/XenAPI.py b/tools/python/xen/xm/XenAPI.py index f4769e9f94..a8cfce8751 100644 --- a/tools/python/xen/xm/XenAPI.py +++ b/tools/python/xen/xm/XenAPI.py @@ -50,7 +50,7 @@ import xmlrpclib import xen.util.xmlrpclib2 -translation = gettext.translation('xen-xm') +gettext.install('xen-xm') class Failure(Exception): def __init__(self, details): @@ -68,7 +68,7 @@ class Failure(Exception): def __str__(self): try: - return translation.ugettext(self.details[0]) % self._details_map() + return _(self.details[0]) % self._details_map() except TypeError, exn: return "Message database broken: %s.\nXen-API failure: %s" % \ (exn, str(self.details)) @@ -108,8 +108,6 @@ class Session(xen.util.xmlrpclib2.ServerProxy): encoding, verbose, allow_none) self._session = None - self.last_login_method = None - self.last_login_params = None def xenapi_request(self, methodname, params): @@ -123,11 +121,7 @@ class Session(xen.util.xmlrpclib2.ServerProxy): result = _parse_result(getattr(self, methodname)(*full_params)) if result == _RECONNECT_AND_RETRY: retry_count += 1 - if self.last_login_method: - self._login(self.last_login_method, - self.last_login_params) - else: - raise xmlrpclib.Fault(401, 'You must log in') + self._login(self.last_login_method, self.last_login_params) else: return result raise xmlrpclib.Fault( @@ -178,18 +172,10 @@ class _Dispatcher: def __init__(self, send, name): self.__send = send self.__name = name - - def __repr__(self): - if self.__name: - return '' % self.__name - else: - return '' - def __getattr__(self, name): if self.__name is None: return _Dispatcher(self.__send, name) else: return _Dispatcher(self.__send, "%s.%s" % (self.__name, name)) - def __call__(self, *args): return self.__send(self.__name, args) -- 2.30.2